From: Felix Fietkau Date: Mon, 6 Mar 2017 09:04:25 +0000 (+0100) Subject: ubifs: Fix RENAME_WHITEOUT support X-Git-Tag: archive/raspbian/4.9.30-2+deb9u2+rpi1~6^2~419 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a260ff509b4d5fde2ac5f863cd3015cefbc45189;p=linux-4.9.git ubifs: Fix RENAME_WHITEOUT support commit c3d9fda688742c06e89aa1f0f8fd943fc11468cb upstream. Remove faulty leftover check in do_rename(), apparently introduced in a merge that combined whiteout support changes with commit f03b8ad8d386 ("fs: support RENAME_NOREPLACE for local filesystems") Fixes: f03b8ad8d386 ("fs: support RENAME_NOREPLACE for local filesystems") Fixes: 9e0a1fff8db5 ("ubifs: Implement RENAME_WHITEOUT") Signed-off-by: Felix Fietkau Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index ca16c5d7bab1..0b5a19de4636 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1088,9 +1088,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, struct timespec time; unsigned int uninitialized_var(saved_nlink); - if (flags & ~RENAME_NOREPLACE) - return -EINVAL; - /* * Budget request settings: deletion direntry, new direntry, removing * the old inode, and changing old and new parent directory inodes.